(strwidth): Fix previous change.

diff --git a/src/charset.c b/src/charset.c
index e88d1839b20bc0da3ae6f271cb7759c50f00a609..8518cc8829d0ca3dc59d9dbaac4cd8d11ca36650 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -811,7 +811,10 @@ strwidth (str, len)
          int c = STRING_CHAR (str, endp - str);
 
          /* Get the way the display table would display it.  */
-         disp = DISP_CHAR_VECTOR (dp, c);
+         if (dp)
+           disp = DISP_CHAR_VECTOR (dp, c);
+         else
+           disp = Qnil;
 
          if (VECTORP (disp))
            thiswidth = XVECTOR (disp)->size;